Use sourcegen bytecode generator to generate internal metadata #11407
Conversation
inject/src/main/java/io/micronaut/inject/beans/AbstractInitializableBeanIntrospection.java
Outdated
Show resolved
Hide resolved
| defaultsStorage, | ||
| loadTypeMethods | ||
| public static byte[] write(String className, AnnotationMetadata annotationMetadata) { | ||
| Map<String, MethodDef> loadTypeMethods = new HashMap<>(); |
There was a problem hiding this comment.
should this be a linked hash map? Will it impact the order of the methods written?
There was a problem hiding this comment.
Fixed, it's only used for testing anyway
core-processor/src/main/java/io/micronaut/inject/annotation/AnnotationMetadataWriter.java
Outdated
Show resolved
Hide resolved
core-processor/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java
Show resolved
Hide resolved
core-processor/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java
Outdated
Show resolved
Hide resolved
core-processor/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java
Outdated
Show resolved
Hide resolved
| * @param p The class element | ||
| * @return The string representation | ||
| */ | ||
| private static String toTypeString(ClassElement p) { |
There was a problem hiding this comment.
this seems like something that belongs in ClassElement or a utility method
There was a problem hiding this comment.
Not sure, we just do some unique string from a class
core-processor/src/main/java/io/micronaut/inject/writer/BeanDefinitionWriter.java
Outdated
Show resolved
Hide resolved
core-processor/src/main/java/io/micronaut/inject/writer/BeanDefinitionWriter.java
Show resolved
Hide resolved
|
| proxyClass, | ||
| proxyClass, | ||
| "<init>", | ||
| newConstructorParameters.toArray(ZERO_PARAMETER_ELEMENTS) |
There was a problem hiding this comment.
would be good to add a MethodElement.constructorOf method that makes this simple
There was a problem hiding this comment.
This is a very unique case, I don't see a point of adding a new method
| @@ -373,18 +444,8 @@ public boolean isProxyTarget() { | |||
| } | |||
|
|
|||
| @Override | |||
| protected void startClass(ClassVisitor classWriter, String className, Type superType) { | |||
| String[] interfaces = getImplementedInterfaceInternalNames(); | |||
| classWriter.visit(V17, ACC_SYNTHETIC, className, null, !isInterface ? superType.getInternalName() : null, interfaces); | |||
There was a problem hiding this comment.
make sure that whatever we are generated retains ACC_SYNTHETIC modifier. I can't seem to see where this is retained?
There was a problem hiding this comment.
Ok, I need to add a support for it first
core-processor/src/main/java/io/micronaut/aop/writer/AopProxyWriter.java
Outdated
Show resolved
Hide resolved
core-processor/src/main/java/io/micronaut/inject/annotation/AnnotationMetadataGenUtils.java
Outdated
Show resolved
Hide resolved
core-processor/src/main/java/io/micronaut/inject/writer/ExpressionsUtils.java
Outdated
Show resolved
Hide resolved
| * @since 4.7 | ||
| */ | ||
| @Internal | ||
| public final class MethodGenUtils { |
There was a problem hiding this comment.
add a private constructor
The PR rewrites all the class writers (except the evaluated expressions writer) to use a new bytecode generator from Micronaut Sourcegen.
I haven't done any major refactoring. Some classes like
BeanDefnitionWriteris too big and need some refactoring